Update to suit LuxeAOSP