Merge "Make AppCompatSpinner read android:entries" into mnc-ub-dev