amd-master
trim trailing whitespace (#12)
Merge upstream 'v1.3.1' into amd-staging (2)
Fix SIGBUS error which is caused by unaliged address access on armeabi-v7a
Merge upstream 'v1.3.1' into amd-staging