Merge "Partial revert of "Align Theme, Theme.Holo, and Theme.Holo.Light with Material attrs"" into pi-dev
am: 4eca92d579

Change-Id: Iba6e9fcf6e697cc630e36b81b27ad1c80a6aa2d6