Regenerate generated files after upstream sync.

(Also fix sort order in Android.mk.)

Change-Id: I64d171fe9dc090ee7f17c489483147cd96e2e26c
5 files changed