Merge "Update the offline SDK to add ConstraintLayout alpha 6 and remove alpha 4"