Merge "Update namespace to match framework/ml/nn" into pi-dev am: 95eef46fa2
am: c5a0f0e47f

Change-Id: I1e324613076f7f35af90026db951742bf7cbb51f