Merge "DrmManager: choose plugin load path based on arch" into tm-dev