Revert "fix the bionic"

This reverts commit f57885ce09065946f88d8503b65fb64903fb55f3.

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