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

Change-Id: Ib589b39b7b3b53eb48dcf742c7d0fa6e4aef6223