Merge "LayoutLib: parsed resources were always set as platform res."