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

Change-Id: I416e1dcf1f93818fc91d71a5899b2adf4124185a