Fixup TWRP Mountup issues

Change-Id: Iea1c080a29e5da0542ce1ca179f7725f59f366ae