Merge "Revert "Remove art targets from PARSE_TIME_MAKE_GOALS""
am: 2bff9a7c79

Change-Id: Ib0ff912ce3bfa34cf29f2b3c219de6e228b6dc96