Merge "remount: prefer 'cache' backing storage for non-A/B devices"