Merge "Revert "Build ijar for apps build"" am: d17c3a57f6 am: c3725c256b
am: 15bead2c59

* commit '15bead2c598308b5a6cd17b64c839676d7286ed8':
  Revert "Build ijar for apps build"