Merge "Update the offline SDK to add ConstraintLayout alpha 5"