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

Change-Id: I7dd79a5f68a9d66575f3f8b4668b14d73b7388bf