Android 6.0.1 Release 54 (MTC19Z)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAld9m+kACgkQ6K0/gZqxDnjqpwCfdN7nACfKf5ihzRv/VzzzkO8P
r70An1oSQBbOlt40cyo0MXnfVamBRctP
=aPuS
-----END PGP SIGNATURE-----
Merge "Srtp: Fix Android.mk mistake"