Revert "Fix build error in Nexus7"

This reverts commit fb36442d98c2063e0da38cfdae1bdf1c26af1447.