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

Change-Id: If3a06d26d9767005e3a430a21d8d82626e8b6d87