Merge "system_server BINDER_TYPE_FD driver ashmem accessors" am: b23a388c64
am: 3196c839af

* commit '3196c839af9ea74c59f5860c0d1f6e7e20b7a65e':
  system_server BINDER_TYPE_FD driver ashmem accessors