Merge "Merge "cutils: add ashmem_init" am: 55ba959c13 am: 3d213c39e8" into qt-dev-plus-aosp