Merge mpr-2021-09-05

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