Add "include $(CLEAR_VARS)" to fix build error in cm 11.0 source tree

Change-Id: I160aaefe2f08f86b5e4c99ce1ab1c8e3c2a09e1a
Signed-off-by: sndnvaps <sndnvaps@gmail.com>
Merge conflict Android.mk

Change-Id: I01f520960ad39a91f8c06a622138988fb72d46aa
Signed-off-by: sndnvaps <sndnvaps@gmail.com>