Add confusion to build numbers.  Let's match Android Version this time.

Change-Id: I4dd7a0597c0027c6908b5d45895dc2863ce9e3cb
Merge "Add confusion to build numbers.  Let's match Android Version this time." into kitkat

Change-Id: Id03c76018d8cf8af5f3b819ab9209e2c95115679