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

* commit '61b771e79f19f19eae62d1b7a97d105ef6222cff':
  Tell soong that it is embedded in a make build