Added Flo

Change-Id: Ic47be2f930ab3df0efa0a211921c84322cd6e1e2
Merge branch 'flo' of https://github.com/PSX-PureSpeed/android_manifest into default