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

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