Merge "Automatic casts for more findViewById implementations" into oc-dev
am: 7458ea3827

Change-Id: I7c77634f1a5b2551830796118e1fe69d389d6884