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

Change-Id: I9549a42daaf469d286b92b249881838b3a50fab6