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

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