Reverts the render order change of commit ce2d33eb97238e2e050d065a8f0838749a0b31d0
Update Android.mk Remove 'src/client' from include_directories