am d6fb5cc9: Merge "Always include CLEAR_VARS in Android.mk"

* commit 'd6fb5cc9872fc6d85065e0336257c7bfcf68a40a':
  Always include CLEAR_VARS in Android.mk