
Merge commit 'cb0f5ed8111d4305cf6798aefdb4f9623570c83a' * commit 'cb0f5ed8111d4305cf6798aefdb4f9623570c83a': Remove compiler warnings when building Bionic.
Merge commit 'cb0f5ed8111d4305cf6798aefdb4f9623570c83a' * commit 'cb0f5ed8111d4305cf6798aefdb4f9623570c83a': Remove compiler warnings when building Bionic.