add support for twrp

Change-Id: Ida5d87f8130f5b9eb83d23c50f66c95b64d42eb6

fix m8 twrp.fstab path

Change-Id: Idce679c2fb36c314490038a0e15dc9b31f155600

fix derp merge