Merge "jordan: update build_id" into gingerbread