Android p preview 2
Merge "Build with core_current"