Fix dependencies of packages that target earlier releases am: 37e9a28262
am: 68117e559a

Change-Id: I9c0617b6d29afd7a00ae6ead042225489b934255