aokp: Add flo

Change-Id: I061114040ddc821d666e21477adc280dea4476fa
Signed-off-by: Rohan Mathur <rohanmathur34@gmail.com>
Merge "aokp: Add flo" into jb-mr2
Find 5 to aokp

Change-Id: I261978910973658f3347af8e837427212f2c27d0

World phone for find 5

Change-Id: I261978910973658f3347af8e837427212f2c27d0
Merge remote-tracking branch 'upstream/jb-mr2' into jb-mr2