Merge "Build same hidden API lists as in pi-dev"
am: c859c8097b

Change-Id: Ie11ef705d2e921ddecb845023c039e68f9633ea3