Merge "libhardware_legacy should depend on libmedia"