am 965f3919: am a2cd924b: Merge "Fix extra/missing : in path setup."
am 965f3919: am a2cd924b: Merge "Fix extra/missing : in path setup."

* commit '965f39190cb50d97b98d47ba8ca205661cfa2c3d':
  Fix extra/missing : in path setup.

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