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

Change-Id: Iecadcca45993149a63cfab52956c05483119250a