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

* commit '855e63e996b7c0d98ed34acefa79535d7efd9fbb':
  Fix theme propagation to contained android:drawable elements