Merge "Set the WebViewLoader's targetSdk same with framework's." am: d7187c90d0
am: f7ba304045

Change-Id: I123b9bdce3fde5405f356fb0b4c80e770eae43b8