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

Change-Id: Id11b842d027f5966458117de9106041f8034b2d1