Support NN dev in O-MR1.

Remove downstream changes to their makefile
which can't be updated in MR1.

Test: pass
Change-Id: I7d621b0366a25d9cbeeb2a4c120d5dd6664ffa2a
1 file changed