Snap for 6198741 from 2878f38f36246144e347a2aab31c28c3f6927e18 to sdk-release

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