Merge "switch to soong"
am: 7569b29092

Change-Id: I17a2932994dbcd82f1826f4b2a0040f38a641714