Fix more build breakages due to pie revert
Signed-off-by: arham jamal <arhamjamal@gmail.com>

Change-Id: Ieffb7e386fab170cefb8fb9d2c6b9fa9da0c086d