Merge "Add non-treble IOMXStore interface"