Merge "Add low-level methods for simple non-atomic indices" am: a5dfba5615 am: eee66b07b6 am: 67a8528aa6

Original change: https://android-review.googlesource.com/c/platform/system/media/+/1478681

Change-Id: If0fc6ee980c2f8b115e488e93c75533877d92249