am 36623817: Merge remote branch \'goog/ics-mr0\' into ics-mr1

* commit '366238178f7a6d26ce051150f4fb65e533c2fae4':
  Use a 10s timeout in uart_read() in FW download mode.
tree: 09523ff87feb3ef06c5f13264597576d4eff3070
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk
  5. CleanSpec.mk