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

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

Change-Id: I1964cc8f7ed4da3499d88b98439d9b097466a029