Revert "Merge branch 'master' of github.com:zhuyuesut/android"

This reverts commit 0278a5d0425cfa2c500792834930bfc1c083ea46, reversing
changes made to e36d0ea668bafdad1ae2a7c2fc08db4e11b1cd28.