Merge SPL-2019-12-05

Change-Id: I300948d8f3a0ad647ecbba26e31d409b44542d6b
tree: 8c3210ebf8282105da3271fe94b5bd9ab6f50c6d
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS