Merge pull request #134 from msliu/v1.3

Bug 958007 - [fugu]: Integrate fugu manifest file. r=mchen
Bug 961949 - [Tarako]: Integrate tarako manifest file. r=mchen