'Updating device tree

 d2: merge apexq

Change-Id: I55e6c248959e0a0657bbd8e3840470ae7adbd5ed
 jf:enable the world phone menu

Change-Id: I524ff7196d9f3ae268178826b986d5dcee1de85f
 jf: fix world mode chioces

Change-Id: Ib16e47ac3658a1e19e520bbb456dcd6c279f49b4
 d2: fix inheritant issues'