Fix bug introduced in https://android-review.googlesource.com/102610.

Also make oatdump work again.

Change-Id: Iab96971645f40585bc04769d410f2273d3977f51
2 files changed