Merge "Script-compatible output for list avds and list targets."