Merge "Move layout_version to /data/misc/installd" am: 7882d92373
am: 09a6914619

Change-Id: Ica32cd9903def32b8c713ccafa5940e2fc92fa31