Merge "Add cleanspec for bitmap jni issue" into klp-dev