did I break android here mysteriously

This reverts commit f2fae368.

Change-Id: I0d941d3e474c6693cd15e1b55baab83a3da48488