Merge "Allows DX alternative Jar." am: 26d769ea3f
am: 16168c016d

Change-Id: Ic14ed3dbee96ac608a7e99b0072d5ac20ea4bf88