Merge "init.rc: start netd and zygote early for file based encryption devices" am: 4bf2bc078f
am: 1a65e43878

Change-Id: I2d2aabda97c7a650aa9812a2d84d60db8ced9d2a