Merge spl-2021-03-05

Change-Id: I2c3b762a747ee6055b73a6a9499830b97526bf19
tree: 6459a22cdf76a6e5325f21d9073c2b40f70575bd
  1. src/
  2. Android.bp
  3. CleanSpec.mk