Merge "Remove all non-Apache2 licensed files from sdk"