Revert "overlay: temporary remove until frameworks/base is ready"

This reverts commit 17149851586484405df0aa4bd84180d49da6d989.
This reverts commit a76636a627b4a52e1f2e5039909b54379eac5eb7.

Change-Id: I2d2f64408ddd91a963ba330aec18e48334b7f540