Merge "Do not enforce hidden API for boot image and preopt compilation" am: 2e6d97bb6f
am: 4655f89b50

Change-Id: I0f2b3845e93c625819035e852d153c2b519b3227