Merge "Remove variables exported by Soong"