Merge "Populate hiddenapi whitelist."
am: 2519de11c3

Change-Id: I0b6139661f07352acdbd62a83cff2bba2b667b9b