am 467f6a4f: am 2aa403fe: Merge "LayoutLib: Fix android:dependency for preferences." into mnc-ub-dev

* commit '467f6a4f0d788fa0bad86bb6545a8254912b99b0':
  LayoutLib: Fix android:dependency for preferences.