Merge branch 'jb-release' of https://android.googlesource.com/platform/external/qemu into aosp
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/qemu into mr1-staging

Change-Id: I8a4a71ac65b08e6e17f26c942f67a15b85211115
Support dynamic skin layout

This CL adds support for a skin whose layout section is
generated at runtime based on the hardware configuration.

Change-Id: I5f81f665b49ce0f3ec5795d922a08b30c1f34b98
Obtain path to dynamic skin layout folder from sdk root

Change-Id: Id83e082238f696aaa0c330020e3310b20ebe5a32
Show dynamic skin if enabled in AVD settings

Change-Id: I083db22b677878919a2e88bfb0df000d2ca1fda6
Merge remote tracking branch 'cm/cm-10.1' into jb-4.2

Signed-off-by: travp624 <travp624@gmail.com>