Merge "display: Remove ashmem header includes"