Merge "Remove the dependencies to ext and framework from the stubs build" am: 9b0e7670f8
am: 58cfae5d38

Change-Id: Ie777d79d75a50530c34b182a524dccc65dc5d3b9