Merge "libcutils: abort for invalid fd" am: 76f99770d1
am: 8a0e1c51bd

* commit '8a0e1c51bdf42bcb3f1840173c27b097d106cd60':
  libcutils: abort for invalid fd