Merge "Work around b/24465209, do not pack relocation table." am: d01890df3c am: d7f77b5a12
am: 618e17473c

Change-Id: I5a09847436a0608942c9c5636d807d7a984def73