Merge "Work around b/24465209, do not pack relocation table." am: a1ac1a9910
am: 35d98e469c

Change-Id: I078ed5a7fae793cb2692b9e592264f3d3f533f44