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

Change-Id: I54ba29a63c2d14bed3d14b001dd43b98403041d2