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

Change-Id: Ie1322881833755f54467ebe53e446f3a6681a34c