Merge "Add audio-route to pathmap.mk"