Merge changes from topic "am-0ee00745-3175-4746-9daa-2f8a6e252eaa" into mnc-dr1.5-dev

* changes:
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: d511dbcbc5 am: f5e0e9d1b8 am: 6ab25560a3
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: d511dbcbc5 am: f5e0e9d1b8
  [automerger] RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2) am: d511dbcbc5
  RESTRICT AUTOMERGE: Fixes two bluetooth bugs causing remote overreads (1/2)
tree: 04426a06c3d8dd46fa433e88dcde1069322b6a45
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE