Merge "More StrictMode work, keeping Binder & BlockGuard's thread-locals in-sync." into gingerbread