Merge "Convert to Soong" am: fa073f4988
am: 0a0cdc00ff

Change-Id: I6fb6cc4735b54962c184e8271bed560bd61fd18b