Merge "Fastdeploy converted to c++ and bin2c on the jar." am: 60fa8b8ad2
am: a84882427e

Change-Id: I71aaf9ec8107b5d7b47608f50783dbe467c05136