Merge commit '6ff57ee310290715c000fd771cd7e18b1537ccbc' into kraken * commit '6ff57ee310290715c000fd771cd7e18b1537ccbc': Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder