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

Change-Id: I1bbc775e326b2c46099a5a11e14801fcbe790629