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

Change-Id: Ib294f05939dc704e680824b2e2dbfbf9cc681f9d