am 4845fa72: am b8ae1879: Merge "Fix android:theme parsing for custom views." into mnc-ub-dev

* commit '4845fa72c236f7c70572a9ae24a8e183edfd485f':
  Fix android:theme parsing for custom views.