Merge "Improve NDK to framework DataSource adaptor"