Merge features for testing android SPIN to "common" folder