Rename the ninja variables that have an extraneous Clang in the name, since there are no longer any non-Clang variables. Bug: 68947919 Test: no change to command lines used to build mmma bionic Change-Id: I081d5e1d423a66d55faece6cb1d265cd5e504d5f