Merge "Build ijar for apps build" am: ec4db56e58 am: 3b5dbebe8d
am: 93e138b723

* commit '93e138b7238153f65844df3d2d9be1156d86c399':
  Build ijar for apps build