Remove Android L specific code from master branch