Merge "Fix ThreadStress, unify ANR lock descriptions."