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

Change-Id: I45facdcaa87aa4d8bed03fb7098f96906aa6792d