Merge "Added additional, acceptable bootloader and baseband versions" into froyo