Fix build errors due to not PA PIE and dirty merges

Change-Id: I3c86196defb4c895e9adcd54b17ada985e12eb16