reverted all ...

Change-Id: I13f7dc2f643b031a0e78a646070f80fa9fc8f998
Merge https://github.com/XPerience-NXT/android_build into HEAD