Merge "Revert "DO NOT MERGE ANYWHERE: bump version to 201604s"" into lollipop-mr1-cts-dev am: 2ba623fdae  -s ours am: 756b5a8e3e  -s ours am: 567a52499b  -s ours am: 8cb50cb5c6  -s ours am: 0c23452dc5  -s ours
am: 24f2dd500c  -s ours

* commit '24f2dd500c86ff03a20d123417d2b3dc3b7f22e5':
  Revert "DO NOT MERGE ANYWHERE: bump version to 201604s"