Merge "LayoutLib: Fix android:dependency for preferences." into mnc-ub-dev