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

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