Merge "Update SDK Pkg Revision for API 21 to 2" into lmp-dev