Attempting to fix for AOSP building + make mproper