Merge "Catch exception when parsing faulty AVD" into sc-v2-dev