Merge "Fix cutils/ashmem.h copyright header." am: f61377979e am: b40f653314

Change-Id: Id5e9f35b1f1256a426d8b57ff504c076443d1f14