Merge "Fix a mistake of CameraAgentFactory's recycle();" am: c7a2095139 am: 3a06cce41f
am: 4d50f1dec8

Change-Id: I3f8839b5a4b00bf2818f07fede3a301389f17e49