Revert "Revert use of 'with' statement for python 2.4"

This reverts commit 7fac4b8d4afb9830f9d9d16c5bde2b593896828c.
Cleanups
Cleanups
Split Android tests
UNDO THIS COMMIT
GARDANDO CAMBIOS
PARA PROBAS
Fix: Fall back to default dialect in PHP parsing after adding new units

Before this, when a PHP simple variable syntax entry was found after any
entry using the define syntax, that entry was not detected.
PHP: Use the clean key version for checking for duplicates

Is not unusual to have entries with the same key but with blank spaces
around it.
Cleanup: Rename colonpos var to enddelpos

It is makes more sense that the position of enddel is called enddelpos and
not colonpos, specially because the end delimiter is not always a colon.
PHP: Improve some comments
UNDO this