am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into...
am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev
* commit 'bc57651f':
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516