Merge "Stagefright command line tool: input file name last"