Merge remote-tracking branch 'goog/upstream-master' into josephjang-nos-merge-upstream

* goog/upstream-master:
  CAVP: CMAC protos
  CAVP: Add CMAC proto, GCM success field

Bug: 159947154
Bug: 159911243
Bug: 159911616
Change-Id: I74d55e37d1f73a3775b10d1e964a5ff6f7705c29