Merge "Android.mk: clear variable at end of use"