Merge "Make /apex on ramdisk" am: 96dc80f97a
am: 93f1ce510e

Change-Id: I208928407fb44f4ac18159f352cb56a18933c509