Merge "Convert to Soong"
am: fa073f4988

Change-Id: I574baf14e1d579bf4e1c0f7272c2d53aed8f359a