Merge "Add lint check for cut & paste errors in findViewById calls"