Merge "Change androidfw tests to native test target"