Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/GateWay.Droid/Resources/xml/file_paths.xml

old mode 100644
new mode 100755