Merge \"Add support for round scroll bars to View.java\" into nyc-mr1-dev
am: 8ec317e220

Change-Id: I3a3db1106b4a3b009b54559189155a7fbefff977