Merge "Camera: extend getBuffer wait timeout"
am: a8fb86eb97

Change-Id: Icd507ea88bafeec83f9df9c942d2dbf628179954