Take into account all packages when installing Android
Fix id of system image for Android API 16