Merge "switch to soong" am: 7569b29092 am: 0aef897d8c am: 404525b7f4
am: a7650f2a2e

Change-Id: I49852ef2417aa35526a803ecdc4242a57c6c2d64