AOSP sync and TW Samsung Update 2 stuff