Fix setup-makefiles to localize apk's to target device

Change-Id: I248c477aa8d38c57d0d24b9904d08a2d0e6acc08