Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2