Merge pull request #624 from jrgonzalezg/master

Possibly fixed bug with incorrect package remapping of android attributes