am b5223c08: resolved conflicts for merge of 679e399b to lmp-mr1-dev-plus-aosp

* commit 'b5223c08d8263954d1418425816e16e0a49573b4':
  Fix BlueDroid signed/unsigned failed test for MIPS build.
tree: f5d70e4fe90339eb9fdaa0788ce190b2f01f7bba
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE