Switch to normal aosp branch