Merge "stem property of java modules are propagated to Make"
am: 5622d5351d

Change-Id: Ib952ed36c96b814ed5ca983ea93cdde65d5f3ffd