am 9396f183: resolved conflicts for merge of a5d29b2c to jb-mr1-dev-plus-aosp

* commit '9396f183c2db5d6167f39a8d5667fb4abcc96e5e':
  Try to free cache before giving up on install
  Robustly add symlink and add for non-primary users