Revert "DO NOT MERGE: CDD annotations for section 3.2.3.1 and 3.6"

This reverts commit 40bfab408bbed71674eb65d67c2795e526094b28.

Reason for revert: <As per bug 111559306 the dependency of CDD annotations to compatibility-device-util adds
  classes to the apk causing the test to fail>

Bug: 111559306

Change-Id: Ida93aa7d209fdfbd7088d23098341e91afd2756e
3 files changed