Reorganize all the commits for Android Studio

Signed-off-by: TengChou Yang <threefure@gmail.com>