Fixed name clash in uibinder when a field is named "owner"

bug: issue 7327
Change-Id: Id9e1a77433a09e913e8ef045c63b3f5bff4bbf17
Added @charset rule skipping

bug: issue 6736
Change-Id: I28e867b39cb1755e9bd132f2d4ddd960c21ee076
Merge remote-tracking branch 'upstream/master'