Merge "Support test_suite and test_config with sh_test" am: 8c84e60f38
am: 542c4cb03f

Change-Id: Id3546a4e65d6933e3e1a85ed4029ad705be1f94e