Merge "bravoc: use less confusing build naming" into froyo