Merge "Add whitelist to build/product_sdk.mk"