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

Change-Id: I476e40fe4959e04a1190752764b935e55c99ab73