Merge "Use RRO for framework-res." into pi-dev