Merge "Revert "Change the directory of ic_launcher.png for wear modules so  that each Wear project is able to have its launcher icon."" into klp-modular-docs