am 8ab3f090: am 8c680128: Merge "Check for null fd when constructing...
am 8ab3f090: am 8c680128: Merge "Check for null fd when constructing AssetFileDescriptor." into jb-dev
* commit '8ab3f090':
Check for null fd when constructing AssetFileDescriptor.