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

Change-Id: I2b26f40d9e4f7f685168509136767621367acf4a