Merge the 2018-09-05 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  Make bound check proper in bbf_Scanner_addOutPos

Change-Id: I7bc6df3a7871ac7c7bc675b969118435c8d30c29