Merge "Use OFFSET_PATTERN from libs.mk"