am 5dbc1f64: Merge "Fix use of holo drawables in a few more places"

* commit '5dbc1f6405c909d6b6ba2da03e5b5fe8b417d1ba':
  Fix use of holo drawables in a few more places