Revert "Move non-AOSP values to vendor_xxxxxx.xml"

This reverts commit 1306c3e8f3d255fbfbef62a5fce3b9aaffd64e31.
set correct API version in clock

Change-Id: I1ef631084d7fd2462faa239ac40aa9c4b4dffe71