Merge "Add Build Brand and Manufacturer to Report Header" into froyo