Make well-formed dependencies file

Change-Id: I118a629d9f9cf430bd16d87e9ce78e885119ebfa