Merge "New ddmlib with screenshots fix from b/62273529 am: 85a19857 am: 829efc70" into oc-dr1-dev-plus-aosp