Add the new library files to the build. (do not merge)

Also move the platform to 2.1_r2

Change-Id: I545270356180d40568abcbad9cdeb28f8c5a53bc
2 files changed