Merge "Tell soong that it is embedded in a make build" am: 61b771e79f
am: 17f2961cd6

* commit '17f2961cd657db074440f970ddf3d3a2b5a0fe28':
  Tell soong that it is embedded in a make build