Android p preview 5
Merge "Build with core_current"