Force merging the master branch into the androidui branch

There were too many changes to use the git mergetool effectively. It
was far better to delete the project and copy in the master branch to
force a full merge instead.