Revert "changes fr/av to android-4.4"

This reverts commit 7ff1fbfb862f1b68dda2bf8337c9f448d434fa92.