Changes necessary for AOSP SG4 build