Revert "some parts fro CM"

This reverts commit e98db53ff2dfa6d98eca4c640ee3ecd07191855b.
from CM

Change-Id: If12f3a69b4adc7a34dadb22a04d1921d18410b7f
Signed-off-by: ChampionSwimmer <android@championswimmer.tk>