Merge "Populate hiddenapi whitelist." am: 2519de11c3
am: 37d670a083

Change-Id: Ic859a5b988ad88430c95590e10439f24f2dfecea