Merged from Lupus: android:binder changes from 2.6.32.60