Revert "Merge branch 'delphi-xe5-android'"

This reverts commit 66962b57ff6e0ee4fd5d43e04173c68f27a1122c, reversing
changes made to cee8047852f004e762be0d603a469ee328fedbe2.