Updated stuff to build with android-5.0.0 branch