Merge "Remove hashtree from builtin APEXes"

			optFlags = append(optFlags, "--assets_dir "+filepath.Dir(noticeFile.String()))

		}

		if !ctx.Config().UnbundledBuild() && a.installable() {

			// Apexes which are supposed to be installed in builtin dirs(/system, etc)

			// don't need hashtree for activation. Therefore, by removing hashtree from

			// apex bundle (filesystem image in it, to be specific), we can save storage.

			optFlags = append(optFlags, "--no_hashtree")

		}

		ctx.Build(pctx, android.BuildParams{

			Rule:        apexRule,

			Implicits:   implicitInputs,