Merge spl-2020-12-05

Change-Id: I8e83b55d28dd5a4cc4dd6941628eccfbfa38b4eb
tree: bc666a6fa941674b31e19493cbeb04b3063d5330
  1. java/
  2. tests/
  3. .gitignore
  4. Android.bp