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

Change-Id: I4a57920cbf83012f8fa6c845d095c2211b2e1d26