Merging subtree android
Merging subtree shared
Small fixes