updates to build with cm7

Change-Id: Ic43289d6c8c282207348f604e69580e7f69619e5