Bring back more PIE targets (1/2)

Change-Id: Ie57a99bbe757fe6df3fd2e8450e8a6e4cacdabbc