Merge "Convert to Soong" am: 9dc8fe3aa0 am: 5d44089940 Change-Id: I3c85f7c9bc13bcd814c27e3650e5d82ec6b4d554