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

Change-Id: I2fad834e5a2daa2823838caff0322b4b43fce47d