am a914acb1: am 6d439213: am bc36ce13: Merge "Restrict system_server to only the data file types needed." * commit 'a914acb1': Restrict system_server to only the data file types needed.