Merge "Fix memory leak in hiddenapi_test"