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

Change-Id: If94d1d0587ad7314df416407c1ab4ad8dedc559a