Merge "atrace: New --prefer_sdk flag" into main