Merge "Add librenderengine_deps to targets depending on librenderengine"