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

Change-Id: If8d94f7a9a39ea91c15419df7d4ddc300dcbe63d