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

Change-Id: Idaa77396bdb7ad42ebda721aa39bc938fa000701