Merge "CTS API Surface Coverage Tool" into froyo