Merge "Modified tests to account for different directories being used based on different first API levels" into pi-dev
am: a6b49b5324

Change-Id: Ia917279df835baa0cbe9f38053ddaa2287c72735