Resolve aosp-4.3 build errors