Android O MR1 Preview 1
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWiHPzAAKCRDorT+BmrEO
eJlzAJ9kb1xq3MaXyaxBgPfYjo100MHbRwCfeqzRuF2/oKfQsAORTcAl2Ij8IPM=
=ssLQ
-----END PGP SIGNATURE-----
Merge "Update change markers in external/bouncycastle."
am: 5efb6f27c6

Change-Id: I148732b7f829092db0af238c411e5e74cf31a870