Android p preview 1
Merge "camera 3_4: Fix compilation errors"