Revert "Tried to bring things forward to android-19 / 4.4 but it failed."

This reverts commit 7491018710a5e1cfce3a1e39eb4390e6ab642ab7.