am f16f1c51: am 229f3977: am 7c7453c0: am 4455ca26: am c53bf778: am 40bc3681: Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev automerge: ea2805d

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