Merge "avcenc: Properly indent assembly blocks"