am d3b1780c: resolved conflicts for merge of 47965ddb to lmp-mr1-dev-plus-aosp

* commit 'd3b1780c45e6a7cf621e7df97203759d08a9c52c':
  Fix BlueDroid signed/unsigned failed test for MIPS build.