Merge "Restore stagefright command line tool." into klp-dev