Merge "Remove make variables exported from Soong"
am: 30b57cd7d5

* commit '30b57cd7d5459c69fbd4332b988b5e636b529f4d':
  Remove make variables exported from Soong

Change-Id: I2b7a6baf5d8a8b3b0bb52e8fc4b16a5616f8f939