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

Change-Id: I38c53a926e1cabd67c194714ca52e4f5f0b417e3