Merge "Camera API1: relax the fps check with some margin" into nyc-mr1-dev
am: 123efa3d1b

Change-Id: Ibb3a2231fd99efb70234cf0d33543bf5382ae176