Merge branch twrp2.4 into cm-10.1

Change-Id: Ia1047c92974891c1a2837953ac8ea80ba9518606