am c53bf778: am 40bc3681: Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev automerge: ea2805d

* commit 'c53bf778c515ed48deb073ba42f68432d55e3d3d':
  Change FRAMEDROP_TOLERANCE value when upper 15MP camera size.