Merge "Remove support for non-NDK extractor formats"