Merge pull request #396 from bhariharan/unstable

Added the ability to merge manifest files from library project
Latest PRNG fixes from Google for crash on Samsung S4 devices