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

Change-Id: I4dd7a0597c0027c6908b5d45895dc2863ce9e3cb
Merge remote-tracking branch 'aospa/kitkat' into kitkat