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

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