Upgraded libraries, removed obsolete Android macros.