Relocate android project files.
Merge commit 'a7b709fdcf6eec32976d2e7ea97249d34d6f6582' into development