Merge spl-2021-03-05

Change-Id: I1fdc2514a0344ffd6b28572e89d208699b4c550e
tree: f95263c33a855c69a499c737fe82a0ab9970ddd7
  1. Android.bp
  2. switcher4.py