am b902f376: (-s ours) am 5d99925d: Merge "fix broken build due to dummy...
am b902f376: (-s ours) am 5d99925d: Merge "fix broken build due to dummy source file no longer being needed."
* commit 'b902f376':
fix broken build due to dummy source file no longer being needed.