Manually merge hs400es from upstream to avoid too much rework. Change-Id: I69821c866ba38ead929f437a16618694d92d470c Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>