Merge "Add LOCAL_NO_PIC to disable position-independent code" am: ce5900a6e0 am: 1eba5a69eb
am: 7a646707fe

Change-Id: Iae48f8df8818e9261a780b3e54f92e1b518cf2ac