Merge spl-2020-12-05

Change-Id: If3f3f97f3eec385b256b21981af0b857c63a61b5
tree: 9b2dded3574b1738ac3f8dca1afd6dd6171230ad
  1. src/
  2. Android.bp
  3. AndroidManifest.xml