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

Change-Id: If45a9dad2ae56e3c16cd59d943bef7e41dc82849