Merge "Fix ARM program header values used for exidx."
am: fc1cf90741

Change-Id: I3836909ce4c059ec1cfda217c5b7179f86fb2c8d