Merge "Print runtime isa when invoking 'dalvikvm --showversion'" am: 445452cda0
am: cec16d0202

Change-Id: Ibf228e8f1ddc0513307ba1b0e5aee2a1e3a15b9d