Merge "Convert to Soong"
am: acbd94d76f

Change-Id: Ib04e6936303b53cf4d919ad07a27a9b8dda86168