Merge mpr-2021-06-05

Change-Id: I93c08c3f6e8edbf91bb0758baeae1381f127ddf1
tree: 7ebd3a0e548f12c7d7af8c22c68170bdf674f2b8
  1. src/
  2. Android.bp
  3. CleanSpec.mk