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

Change-Id: I9db08f7ce7284d16f5f651ce8f115a3d20387b5b