Merge "Move to "official" app toolkit Make target"