Merge from AOSP

Change-Id: Ibb6386ef8d1e5aa4992d4b9dbeae4a259b917559
tree: 73ff404724eea051a6f658ccfefbb877984004b0
  1. bin/
  2. include/
  3. lib/
  4. libexec/