Merge "libcutils: clean up the ashmem code a bit." into main