Merge pull request #7984 from ricardoquesada/fixes_platform_directory

Fixes platform directory
Android properties back to 10
Merge pull request #7986 from ricardoquesada/android_props_fixes

Android properties back to 10