Revert "Update overlay to match what is in RC"

This reverts commit c59f2a701efd1fc863960862ad55c52e4d3ad56b.

This commit broke the build. Reverted.



Change-Id: I5eb034b24a86c765f7d78ade2b7ad17872d2d40b
Signed-off-by: doc <doc.divxm@gmail.com>