Merge "Android.mk: clear variable at end of use" am: 5d9c1e7430 am: edf9c79e42 am: 05f9a1cec6
am: c2eb5566b6

Change-Id: I508ff5d855138f561fa75f1e0710f62948aa594d