Merge "Convert to Soong"
am: b466949e32

Change-Id: I3572e751c4f5da7e57fed17a39c481c51d4c758b