Merge the 2019-04-01 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  Add some error/overflow checks in codebook handling

Change-Id: If16f92138aefb606dc93088d6d0c62500cbcb1a6