Merge "Convert to Soong" am: c6fd8bb6f9 am: 64b243a740
am: cd3c6b78e9

Change-Id: I11f9d14c52c830546724c78fdccf6c688a1d42a8