Merge "update 4.4 to 5256980 for x86_64" am: 9bdecb8396 am: 3473648491
am: 088179c91f

Change-Id: Ic3461c8d41042777bb07311c9fbb74b98fbb5eac