Update framework overlays.

Change-Id: I5e609cd266a84165a083f5ad55eabc5b0e368d06
Merge branch 'cm' into HEAD