re-add camera_metadata includes for camera use

Change-Id: Ia1acced36e0ce50612fa01218439de00d59114b9
fix graphic artifacts when rotating

Change-Id: I6ca615bca84eb600c808bce439197f86e74fe729