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

Change-Id: I2aa2d1d87f4739364e4a43ee8021f6c52a3e8dc5