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

Change-Id: If0af0b9e660ee2a861cdb36c8e7e174d240b7665