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

Change-Id: I2969667892dbd019bb93b20babb9805f083935eb