Updated to android sdk 23.0.5