Instead of adding the used common files to each arch that doesn't
override a file, make the architectures list the files they override.
Also updates the Android.bp file to match the Android.mk file.
Change-Id: I7d6a9c2e1c6b6cc9430aa818a89a2ccf52f62c98