Android U Beta 4 GPL
Merge "Suppress sync-alignment warning" into main