am 11872e25: am c47bea9d: Merge "Remove nonexisting module names."
am 11872e25: am c47bea9d: Merge "Remove nonexisting module names."

* commit '11872e259252ffa45874c8e3ebe38a3c41bbd579':
  Remove nonexisting module names.

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build