Merge "Remove unused arm defines. DO NOT MERGE" into jb-mr2-dev