Merge "Update for v4.12.3 kernel headers." am: 6dfe8cde2c
am: 2f31321c0a

Change-Id: Ieb5c6f0a781c09e013eb060a3aafe6405fa95ce8