Merge "Fix ART run-test 990-method-handle-and-mr with javac+dx."
am: 625380a362

Change-Id: I69cca099382fd57bea93bffd2727d39474cc1814