Merge "Unify some duplicate StrictMode-enabling code." into gingerbread