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

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