Merge "Remove libdvr platform library"