Try to fix PIE enabling NPE FC

PS1: Not yet there
PS2: More fixes, still not there
PS3: Burn mother fucker, burn!!!

Change-Id: I94afba3f31baa96146878c147213005f96b9f06f
Merge "Try to fix PIE enabling NPE FC" into jb-mr2