Merge change 21210 into donut

* changes:
  Make sure that the android pref folder is always present when queried.