Merge "Some StrictMode API changes." into gingerbread