Sync working tree

Change-Id: I275cb4444ae825790864381915f1f23821308512
Move to user builds instead of userdebug

Change-Id: Ib3183537058dfe69f453bac95e26440f5d4ba106