Merge "Add update option to dexdump test runner" am: 10b8747ec6
am: 28fa007c50

Change-Id: I027bf515de56399ad21fed98468b59ba0e649554