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

Change-Id: I7b535874bfef2ada0eb9fc5e0437584862c9218b