Treat all prebuilt apk the same way

Change-Id: Iddfd3ee0780b78c58a7ae558083c6af85b13f84c