Fix tests for new test path

Only fixes in aosp, we still need to find a platform independent
path when building outside aosp

Change-Id: I9632c04049fb4729a8f7c3bf042a5a1cdd0990e8
7 files changed