[automerger] Fixes two bluetooth bugs causing remote overreads (2/2) am: cd26d8d654 am: 2e1be2f7de

Change-Id: I36cca997401a549ed94036dd48efa7ba00d73fd4
tree: bfd3a851a77925cd09d5d21a6e5bd6da1710c04b
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE