Merge "camera: remove redundant and unnecessary includes"
am: 9dae907ea0

Change-Id: If7993db6028de52868b4126623e1f020a0183faf