Merge "Move layout_version to /data/misc/installd"