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

* commit '29345d8d21ebe2dfd39a09bda0205740a994de47':
  Fix theme propagation to contained android:drawable elements