Merge "Add jetifier jar for Soong run."
am: 70fab9c3d5

Change-Id: I8b83e1fc790855f7c3211c352cfeac732f439dda