[automerger skipped] Update kernel to builds 6487912 am: d36e8ad612 -s ours am: 3f4e71602d -s ours

am skip reason: Change-Id I2b9b3eb475c4f55af77e122b0eb3096f7590662d with SHA-1 a7798b885b is in history

Change-Id: I48aec43f83bcc1310c0987c443f6dd041bbb6918