Merge "Fix AMRWB test util and remove useless files"