Revert "fix the bionic"

This reverts commit f57885ce09065946f88d8503b65fb64903fb55f3.

Change-Id: I7d81973528e5a76495ab18bb5274c46f62eaa592
Merge "Revert "fix the bionic"" into jaf-1.1