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

Change-Id: I389463c848da427fdefeae8f3119ed73e2818d4b