Merge "Add --no-test-api-acces to am instrument."