Merge "Do not enforce hidden API for boot image and preopt compilation"