Merge "Add min_sdk_version to BuildManifest.apk"