Giving up... Not worth the effort

Revert to android-L branch