Merge "new styles and tab-highlighting to support custom Android Studio site...
Merge "new styles and tab-highlighting to support custom Android Studio site design am: 190e610d am: 7a7b9648 am: d82c81c5 am: e08685e4 am: 6c9b362e" into nyc-mr1-dev-plus-aosp
am: 42ccefef
* commit '42ccefef':
Change-Id: I5c043c4761383616e0f7eae530b87c77f7285250