Merge "Remove declare-sdk-prebuilt" am: 9d50db02ab am: 918c21ed3e
am: 10c86ea60c

Change-Id: I8a71d655e8c01b3bbc34af77ed737d7312251c96