Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into mnc-dr-dev

* changes:
  [automerger] DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result am: c361d98bff
  DO NOT MERGE Fix unexpected behavior in bta_dm_sdp_result
tree: 7fe265ea809eefb1c0670cb05dbb79fd82188755
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE