Merge "switch to soong" am: 7569b29092
am: 0aef897d8c

Change-Id: Ib06030d3ac890be65e7bb7fb5dd6bf1063192e24