rhine-common: squash changes for TWRP, F2FS and fixes from CM