Merge "Camera: parse preview fps and fps range correctly" am: 4d9abd9392
am: 35be00e8e6

Change-Id: I840520af5fb08bea112ce0927ddfdde6df322bf3