Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev am:...
Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev am: 55d2b6e8 am: 257d2ca7
am: e01b99fa
* commit 'e01b99fa':
Correctly derive ABI for apps on adopted media.