Merge change 20085

* changes:
  Update PBAP per review comments:
tree: b633522827227cec6085073dd6a9c7f60d5d0074
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. AndroidManifest_test.xml