Android p preview 4
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWzJwLwAKCRDorT+BmrEO
eMLKAJ9aXOWCPGudv69VXT7Cng2ZfxDIJwCfVBtymL195YP/xRjcITqhVaYiieI=
=gaT8
-----END PGP SIGNATURE-----
Merge "camera 3_4: Fix compilation errors"