Merge "replace "android" by PLATFORM_PACKAGE_NAME"