Merge "StrictMode: fix non-SDK API usage detection." into pi-dev