Merge "Fix product policy in prebuilt_policy.mk"