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

Change-Id: I29ee7416c0e1f59d905c194b1f3baf710306587b