Merge "Always include CLEAR_VARS in Android.mk"