Merge spl-2020-12-05

Change-Id: I4bc647a5c9f51d065b0dcc1508d8212040796d00
tree: 1de9b7b71ee4add95776b718044acced8f100bc7
  1. apex/
  2. Android.bp
  3. OWNERS