Merge "Update for kernel headers v4.7.2." am: 73d2cc570d am: c4abab8578
am: 99bb22da1b

Change-Id: I7f4a1e252b2eef6604fcc6f4a97ea60e1dd30238