Merge "Add shell_test_data_file for /data/local/tests"