Rearrange init files to match stock Android 4.3, pt 3

Change-Id: I60f283a2025e97be94edb59f2275e187ec8501ce