Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev am: 55d2b6e8e6
am: 257d2ca7fd

* commit '257d2ca7fd75926bd1cfd13d3a07809e2d51a097':
  Correctly derive ABI for apps on adopted media.