Merge "Explicitly include Apache license in LICENSE, etc."
am: 56d4e91360

Change-Id: I6215c90f65b1fb8d21161c5be340b83013d90046