Merge "Work around b/24465209, do not pack relocation table."
am: 6e92890135

Change-Id: I4fee7355a017c008c4753ad36800e121d4d698ec