Merge "Change test and apache stub modules to point to new stub files."
am: f2576a717a

Change-Id: I5aa317fa4640f09bc44ace82220ce9d451f328b9