Update aosp-s4.xml