Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread