am f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor...
am f096ed68: am 2fd045c0: DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
* commit 'f096ed68':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516