Merge "Freeze HALs for Android P" into pi-dev