Android p preview 1
Merge "Fix excluded sources to not include common sources"