am 29bc3290: Merge "Always include CLEAR_VARS in Android.mk"

* commit '29bc3290b3fa7005ea9a68c22cfa4731557d6c61':
  Always include CLEAR_VARS in Android.mk