Merge "init: manually restorecon mke2fs tools on ramdisk" am: e2629c5682
am: 06c1500a14

Change-Id: I75048ef3ab79aa9404e59b17813ce5b1a6f5cdd7