CB-7536 Tweak error messages for missing JDK / SDK / AVDs
Merge branch 'master' into 4.0.x (error messages)