Merge "DO NOT MERGE ANYWHERE: bump version to 201604s" into lollipop-mr1-cts-dev