Merge "Reset libc targetSdkVersion"