Merge "Remove AOSP reference to utils.mk"