This reverts commit 6d51085202. And add missing bionic_sdk_version.h. Change-Id: I24cc738b1fd1d26234c52afbc787f5b3c4a9c9cb
6d51085202