Merge "Add whitelist to build/product_sdk.mk" am: 62cb157dec am: eec0f0044d
am: c186f7a2de

Change-Id: I1c42e031c7953fd7bbf0db7a4186061d5af4998f