Merge "Not specify return val of View#onSaveInstanceState" into oc-dev
am: 1454afce82

Change-Id: I070b96a2220c88e40b2d274ca03f5ea6fca04396