Merge with rockchip sdk patches

Change-Id: I3750a34c311d4905e4ff88842a023ea5fcbfd4cc