Merge "Revert "Build ijar for apps build""