merge Android-4.3 to master