update hwcomposer.h and camera_metadata.h

Change-Id: I40a8db2bea1d51aebf8675992052ce1f052775e0