Remove merged commit http://review.cyanogenmod.org/#/c/31545/