Android p preview 2
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWvHdXwAKCRDorT+BmrEO
eNj5AJ9gcdWbJRkG6XXQ0jAeRo67sqdPbQCeLGnSyu8a4ehKTXZHYzGPeQPh62Y=
=nd82
-----END PGP SIGNATURE-----
Merge "camera 3_4: Fix compilation errors"