Updated project support files.
Removed hack for dealing with API level 5. It was breaking current builds.