Jellybeans aapt config line changed

Separate handling of pre-Jellybeans and Jellybeans aapt output for specifying the current config
Fix the mcc and mnc modifiers