Merge "Remove misleading line from dx.jar Android.mk file." am: 96a1c677c7
am: 19b7d3bea5

* commit '19b7d3bea50b909aa791846ed5a2595e07db316f':
  Remove misleading line from dx.jar Android.mk file.

Change-Id: Ia98e39543b3bef31e448d9d6ee4bd0fa0b5919f5