Moves cocos/2d/Android.mk to  cocos/Android.mk

Easier to find Android.mk
Merge pull request #6541 from ricardoquesada/android_mk_fixes

Moves cocos/2d/Android.mk to  cocos/Android.mk