Merge changes I7f6d361d,I57295fe1

* changes:
  Added codecserviceregistrant_fuzzer
  libmedia_codecserviceregistrant: Updated Android.bp