Update build to oxygen_1007

Change-Id: I3e8ad65574adf0014bd30cfecbfdd8d12591149d