Merge "Fix issue with Android.run-test.mk" am: 8b83ba5d53
am: 42b079c9a3

Change-Id: I0b89e53eb7aa3c5ecad4efc48cfc81fd9ac5c1eb