Merge of [http://go/wvgerrit/123643]. Fix included: http://go/wvgerrit/111603 Fix L3 block offset test and re-enable buffer overflow tests http://go/wvgerrit/111784 Fix heap overflow test in L3 and OEMCrypto ref Test: Ran L3 unit tests Test: GTS tests https://android-build.googleplex.com/builds/forrest/run/L68100000872640856 Bug: 182584472 Change-Id: I237f52c715e691a52256bf01fa2422aeb34e45f3