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