bring in aoba and hikari

* preparing for Xperia Ion and Acro S releases :)