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

Change-Id: I9ad4072740a1ab77689440f6af1edc1b5cfd8f4e