Kill DECL_PROP1IMPL and related (odk part)

Change-Id: Id4cd66b6082ec53facc985af48fc92de58a4c066