Merge "Camera: extend getBuffer wait timeout" am: a8fb86eb97 am: 453a3787f9
am: fd9ed407e0

Change-Id: I0409acec970e4d2a94c596ef9f888e43029897aa