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

Change-Id: I326e2bfa3ca92a5d4366602cc68013e173a19232