Merge "Fix ARM program header values used for exidx."