[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 11434978ec -s ours
am skip reason: subject contains skip directive

Change-Id: If1eac7ad024e4ce05a5c264fe3bfb9e39ee4c536
tree: 86f8e6cbe70d24637f89f0c6343977a60b11b04f
  1. binder/
  2. docs/
  3. include/
  4. src/
  5. tests/
  6. Android.bp
  7. iorapd.rc
  8. TEST_MAPPING