Android O MR1 Preview 2 (OPP6.171019.012)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWiiQhwAKCRDorT+BmrEO
eERLAJ0Sb0Ha8r4peT1IEa41vMad0lQeJgCeI/aTX8f0Tn2tcYmV+IX5uxM+sY4=
=mYDx
-----END PGP SIGNATURE-----
Merge "Update change markers in external/bouncycastle."
am: 5efb6f27c6

Change-Id: I148732b7f829092db0af238c411e5e74cf31a870