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

* commit '7ec97fdc1627c48ab7bb161f273aaeba33c850d1':
  Remove make variables exported from Soong

Change-Id: I5007f9293791657245b4ddc38cff691487f43b52