Merge "Combine soong builds into make builds"
am: 3bfc560cc5

* commit '3bfc560cc54b58376d095aeaf22d3a74726bcec7':
  Combine soong builds into make builds