Merge "Update build numbers for nougat release"
am: 6637a41504

Change-Id: Ib8ea2f2b7e8bfd5bd96e5651d3a6c3531b233fc9