Revert "Merge remote-tracking branch 'du/lollipop' into cm-12.0"

This reverts commit 75e289eef3862b74367be09e5c14c3ed0023b744, reversing
changes made to e3cad92c18101fc5dc9ff35bb489c0cba519db5e.