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

Change-Id: Ie385a2eb668137e51ba17ecdaa44a1518dea2638