Revert "Re-hide AXIS_SCROLL constant."

This reverts commit 8171658b9fdcbd8faf84aa01f187cc8e7d56fa9e.
Bug: 27314061
Bug: 22836852
Bug: 18707397
Change-Id: I6f78962cfa18f11ce5c8caa1d146252bd79f6dbd
4 files changed