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

Change-Id: I76a275c7b1be1e4c7c84b2c267ff2a2b082b8617