Merge "Remove make variables exported from Soong"