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

Change-Id: I0e93a0ff7cde618b7acaf17ba676f68203fac155