Merge "Add genres to correct db based on where the audio entry is inserted." into qt-dev
am: 86f3b1a69d

Change-Id: I03745811f5276aa571843a4b9b351c6250f85ea7