Merge pull request #3417 from folecr/cleanup

Minor code cleanup
Remove unused option in build script
fix evaluation of properties array read from local.properties
TestCpp builds both ARM and x86 versions
set android:debuggable property to true
APP_OPTIM is debug
ndkgdb.sh for TestCpp
Android platform version used matches all other sample projects
Add --nowait option (Android has broken something again in NDK/SDK/emulator/etc.) and the debugger will not work correctly anymore