Merge "Fix the system property tests to use $ANDROID_DATA."