Merge "Adding relevant surface flinger files to CMake"