Revert "Update to latest AOSP source."

This reverts commit 99b42671d67f70a86b5137fa4ba0f74a2df60c4d.