relicense new source files under BSD am: 50e31fa7e9
am: a8afd12d79

Change-Id: I9e5720ce208718f25f816c11be455d7f06c6ee4f