Merge changes I650d1072,Ia36227de

* changes:
  Added fuzzers for libkeymaster4
  libkeymaster4: Updated Android.bp