Merge "Remove misleading line from dx.jar Android.mk file."