Snap for 8564071 from a17cc37541597fbb02676bbda5afcc2b1077cbf7 to mainline-conscrypt-release

Change-Id: I335928381886618143c4bad7b21285338b8a1d70
tree: f0cee68420551e1e2e9d21d7af7eab3ae9490e52
  1. Android.bp
  2. switcher4.py