Merge "Fix checkbuild." into rvc-qpr-dev-plus-aosp
tree: 834f2ceb7501031f38e112507e12ebad8bd80be6
  1. src/
  2. tests/
  3. Android.bp
  4. OWNERS
  5. PREUPLOAD.cfg