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

Change-Id: Iacc7269b12d2561e8e198b903e4efe1f38d1b7e6