am 9f64867d: Merge "Fix theme propagation to contained android:drawable elements" into lmp-dev

* commit '9f64867da107b772b867876ddf979d1a3ec19192':
  Fix theme propagation to contained android:drawable elements