am 87e0e8a7: Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS""
am 87e0e8a7: Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS""

* commit '87e0e8a7642bd1f5bfdb7b8313df60a77119690a':
  Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"

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