Snap for 7799923 from c33cf5e7c922b6cdd17617f4c72bf72a88ca4390 to mainline-os-statsd-release

Change-Id: Iff4f7c603533ac21a320dd140ff9292aa7adad23
tree: b01c04b523e6a36bd765224d36e3d11e646229fa
  1. Android.bp
  2. switcher4.py