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

Change-Id: I131eca067fb6e0bd8bb05c319785e005dc743e45