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

Change-Id: Ibe89859934e7116c9a0accde46e08ee1e6816511