mdp: increase timeout to 5s

Change-Id: Ia9ba7a5bce7e3cdec4ab73c89271acb485f904ad
Merge "mdp: increase timeout to 5s" into jellybean
Vivow: add support for SERIAL_MSM_HS_PURE_ANDROID

Change-Id: I9b201a4a405a7b0f81708f9cd616730307072949
Merge "Vivow: add support for SERIAL_MSM_HS_PURE_ANDROID" into jellybean
Merge remote-tracking branch 'upstream/jellybean' into cm-10.1