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

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