Merge spl-2020-12-05

Change-Id: Iaa12e7e0c9f6c78f86968ccde888df281d9c5a80
tree: 6ac2616654bd263867f05ae394ee9526af458dcc
  1. tools/
  2. Android.bp
  3. METADATA