Merge "Fix NoClassDefFoundError due to CursorAnchorInfo in K"