Remove useless cmhw in AOSP

Change-Id: Ia06e0a4f5ac443111a575f66d84ddf978ebfa774