Merge "Remove variables exported by Soong"
am: 4e5df99720

Change-Id: If8f414d4699ed061238cc8da576bb8c50a07a509