Add new source files to build. am: 498f031515 am: d8bdf8b36d
am: 3d46029e4a

Change-Id: I97a5e6f411192ac650d1cc0694010535e2046356