Merge "Adding some build rules in Launcher3"