Merge "Revert "Ramdisk: add metadata dir in ramdisk"" am: 456397830d am: 5a6578b7bd

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1513652

Change-Id: I948a57502af113022428644b3c32c369322c8019