am 8cac6317: resolved conflicts for merge of 76fb6019 to lmp-dev-plus-aosp

* commit '8cac6317c5301ae1235fcb1e1befa4c6ca3ca185':
  Update frame-larger-than limit to 2440 for new clang.