Merge "Update 4.14 to 5037610 for x86_64 and make it current"
am: 0634f43fa5

Change-Id: I22b78664641a830d39f70374d09433a5c5f19953