Merge "libcutils: ashmem fortify and comply with Android coding standard"