am 886caa44: am 77d17b6c: Merge "Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS""

* commit '886caa4405e5aac6143f08c359ea1f777eda87ec':
  Revert "Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS"