Revert "Merge branch 'project' of https://github.com/zzzzddddgtuwup/Android-5236 into project"

This reverts commit 4ca8d52f30c366729d717fa4fe1a037510ce728a, reversing
changes made to 754d110ac8e9bc5d9aae187925bc8765ff3a7f77.
Merge branch 'project' of https://github.com/zzzzddddgtuwup/Android-5236 into project

This reverts commit c6a1cbb8b1db416c79506754e9f244fca6f30ab9.

Conflicts:
	Android-5236.iml