Fixed manifest paths, added FM radio back in

Change-Id: Ie568e768a99ae991b0d60c85c6b3dbacdb25f9cc