Merge "Fix StrictMode for Binder.dump()" into gingerbread