Fixes for TWRP build

Change-Id: I20f9fd92d0c85349edf167f38e96c3a15bc6f389