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

Change-Id: Iaadd84723e52edb4e9d2b95865a38a696d632574