Update for the comments and upgrade to Android 17 SDK for build