Merge mpr-2021-11-05

Change-Id: Ib3c68072a42d7aca7d7fa711bd82f923f20bc6eb
tree: d4c2c25d4f2eb95010d7e84a41b2128d9973c1c4
  1. tools/
  2. Android.bp
  3. METADATA