Merge the 2018-05-05 SPL branch from AOSP-Partner into android-7.1.2_r36

* origin/security-aosp-nyc-mr2-release:
  DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
  DO NOT MERGE Prevent out of bound memory access in GetInvInt
  Fix out of bound memory access in lppTransposer

Issue: FP2N-106
Change-Id: I126ff7131cdfcc29993a40a1a5f5db2a39582b94