Snap for 5814112 from 8ca468ca86ed8503176f19442c24fca74cc701f3 to rvc-release

Change-Id: Ibdfcb7d7d886115ad84e6d6815a02225027812f6
tree: 42aaff17f746a1267e8ba54efbaf640f26317613
  1. Android.bp
  2. switcher4.py