Merge "Remove NxpLog NxpConfig"
am: 8a0c6ff7ae

Change-Id: Icc22636e1ee942b574205c788c6080a9fb41f089