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

Change-Id: I3421c0308d95c7bc0e0a922544df0e154a835985