Update to 4.7 master

*updated oprofile to fix build errors

Change-Id: I04d0e9ce39f87ce8cdf7318a6fa26f3f41465b38