am ae5ace55: (-s ours) am bd8ff5b5: Merge "DO NOT MERGE. Fix asset file...
am ae5ace55: (-s ours) am bd8ff5b5: Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread
* commit 'ae5ace55':
DO NOT MERGE. Fix asset file descriptor for pipe based fds.